Auto merge of #1120 - rndr:issue-831, r=alexcrichton
authorbors <bors@rust-lang.org>
Thu, 8 Jan 2015 19:18:04 +0000 (19:18 +0000)
committerbors <bors@rust-lang.org>
Thu, 8 Jan 2015 19:18:04 +0000 (19:18 +0000)
Closes #831


Trivial merge